From 919a239a3c8f70cdb6963f76787588bd7a2a17a7 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Thu, 30 Mar 2006 00:11:53 +0100 Subject: [PATCH] Same panic() behaviour as native Linux when running as domain 0. That is, no reboot: just sit there and flash the keyboard LEDs. Signed-off-by: Keir Fraser --- linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c index 6e3a87ae5b..8a83da25e7 100644 --- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c +++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c @@ -1633,9 +1633,9 @@ void __init setup_arch(char **cmdline_p) physdev_op_t op; unsigned long max_low_pfn; - /* Force a quick death if the kernel panics. */ + /* Force a quick death if the kernel panics (not domain 0). */ extern int panic_timeout; - if (panic_timeout == 0) + if (!panic_timeout && !(xen_start_info->flags & SIF_INITDOMAIN)) panic_timeout = 1; /* Register a call for panic conditions. */ -- 2.30.2